From: kaf24@viper.(none) <kaf24@viper.(none)>
Date: Sat, 12 Mar 2005 14:48:18 +0000 (+0000)
Subject: bitkeeper revision 1.1236.25.7 (42330132deNMlShMHnhiB6lqTUcESQ)
X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~17857^2~26^2~14
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/%22bookmarks://%22Dat/%22http:/www.example.com/cgi/%22https:/%22bookmarks:/%22Dat?a=commitdiff_plain;h=d60a056dd171d661ab2ef257483d3f06edda524e;p=xen.git

bitkeeper revision 1.1236.25.7 (42330132deNMlShMHnhiB6lqTUcESQ)

Fix VMX guest scheduling.
Signed-off-by: Leendert van Doorn <leendert@watson.ibm.com>
Signed-off-by: Keir Fraser <keir@xensource.com>
---

diff --git a/xen/arch/x86/domain.c b/xen/arch/x86/domain.c
index 71cc7e1581..cfb60bfcb5 100644
--- a/xen/arch/x86/domain.c
+++ b/xen/arch/x86/domain.c
@@ -765,7 +765,7 @@ void context_switch(struct exec_domain *prev_p, struct exec_domain *next_p)
             __asm__ __volatile__ ("lgdt %0" : "=m" (*next_p->arch.gdt));
 
             __sti();
-            return;
+            goto done;
         }
 #endif
  
@@ -810,6 +810,7 @@ void context_switch(struct exec_domain *prev_p, struct exec_domain *next_p)
 
     switch_segments(stack_ec, prev_p, next_p);
 
+ done:
     /*
      * We do this late on because it doesn't need to be protected by the
      * schedule_lock, and because we want this to be the very last use of